Skip to content

explicit diffusion part 2 - variable groups#974

Merged
travissluka merged 3 commits intodevelopfrom
feature/diffusion_part2
Nov 14, 2023
Merged

explicit diffusion part 2 - variable groups#974
travissluka merged 3 commits intodevelopfrom
feature/diffusion_part2

Conversation

@travissluka
Copy link
Contributor

Description

Previously the EXPLICIT_DIFFUSION block could only use a single correlation length for all the variables.
This PR adds "variable groups" so that multiple different lengths can be used for different variables.

Don't pay too much attention to the code changes, since some of that will change again once 3D support is added (it was mainly wrapping parts of the existing code in loops to handle groups). Instead, make sure the changes to the yaml input files make sense.

  1. Changes to the yamls:
    The calibration step now takes a list of groups that have their scales defined (note that this is just a group name, it is not actually associated with any model variables at this point). All the resulting parameters are saved to the same output file.
    image
    When using, for example in the dirac app, groups is required and does a mapping between the group name in the parameters input file (generated in the above step) and the actual variables in the model. If a model variable that the diffusion operator is supposed to process is not in any of the groups, a error will be raised.
    image

  2. If you look at the test diracs, T (left) and S are the same as they were before, SSH dirac (right) has been added and uses a smaller length
    image

Copy link
Contributor

@kbhargava kbhargava left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Builds and runs fine on orion. Will test a realistic case after the part3 PR. Thanks Travis!!

Copy link
Contributor

@guillaumevernieres guillaumevernieres left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @travissluka

@travissluka travissluka merged commit e658994 into develop Nov 14, 2023
@travissluka travissluka deleted the feature/diffusion_part2 branch November 14, 2023 18:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add support for groups to EXPLICIT_DIFFUSION

3 participants